Replaced qAsConst with std::as_const

Signed-off-by: Pablo Ariño Muñoz <progpabarino@gmail.com>

diff --git a/src/common/ownsql.cpp b/src/common/ownsql.cpp
index 9271a2a558764f8b4f96884ba197712b8a9ab786..f722e389048dc317060252442eddc64d0bd8154e 100644 (file)
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -186,7 +186,7 @@ QString SqlDatabase::error() const
 void SqlDatabase::close()
 {
     if (_db) {
-        for (auto q : qAsConst(_queries)) {
+        for (auto q : std::as_const(_queries)) {
             q->finish();
         }
         SQLITE_DO(sqlite3_close(_db));

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 6d5544feeb431d1ac362c25a84f06736dd712640..689b022b77ce68d9b48f2a905e3d839194274a87 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -853,7 +853,8 @@ void FolderMan::slotAccountStateChanged()
         qCInfo(lcFolderMan) << "Account" << accountName << "disconnected or paused, "
                                                            "terminating or descheduling sync folders";
 
-        for (Folder *f : qAsConst(_folderMap.values())) {
+        auto folderValues = _folderMap.values();
+        for (Folder *f : std::as_const(folderValues)) {
             if (f
                 && f->isSyncRunning()
                 && f->accountState() == accountState) {

diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp
index 16f797d3946afb05f08ab8a0dc4226ae5cb3001b..19556eb6a5bdf3e6745b887d429d44a3ffe97464 100644 (file)
--- a/src/gui/ignorelisttablewidget.cpp
+++ b/src/gui/ignorelisttablewidget.cpp
@@ -100,7 +100,7 @@ void IgnoreListTableWidget::slotWriteIgnoreFile(const QString & file)
     // We need to force a remote discovery after a change of the ignore list.
     // Otherwise we would not download the files/directories that are no longer
     // ignored (because the remote etag did not change)   (issue #3172)
-    for (Folder *folder : qAsConst(folderMan->map())) {
+    for (Folder *folder : std::as_const(folderMan->map())) {
         folder->journalDb()->forceRemoteDiscoveryNextSync();
         folderMan->scheduleFolder(folder);
     }

diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index 6cc742684bc2bb5eb730cb5544e3b82dc750dfd7..7253e89557357598314d7049a07e549a8a05e87e 100644 (file)
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -218,7 +218,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
     // list of top-level folders as soon as possible.
     if (_oldBlackList == QStringList("/")) {
         _oldBlackList.clear();
-        for (QString path : qAsConst(list)) {
+        for (QString path : std::as_const(list)) {
             path.remove(pathToRemove);
             if (path.isEmpty()) {
                 continue;
@@ -249,7 +249,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
     }
 
     Utility::sortFilenames(list);
-    for (QString path : qAsConst(list)) {
+    for (QString path : std::as_const(list)) {
         auto size = job ? job->_folderInfos[path].size : 0;
         path.remove(pathToRemove);
 

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 5853e4971533aa404f89cab8452f43db6a80cc98..31aba69c318988967cd01976d5a2c4812a1b2ecd 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -350,7 +350,7 @@ void SettingsDialog::customizeStyle()
     QString background(palette().base().color().name());
     _toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, dark, highlightColor, highlightTextColor));
 
-    for (QAction *a : qAsConst(_actionGroup->actions())) {
+    for (const auto a : _actionGroup->actions()) {
         QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette());
         a->setIcon(icon);
         auto *btn = qobject_cast<QToolButton *>(_toolBar->widgetForAction(a));

diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp
index 9b7ad20c09588a4f031460577131a756fcd07f75..bd4aa9a1d8a15e49b6b5266f8a1be88f4940b523 100644 (file)
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -34,7 +34,7 @@ namespace OCC {
  */
 static void updateFolder(const AccountPtr &account, QStringView path)
 {
-    for (Folder *f : qAsConst(FolderMan::instance()->map())) {
+    for (Folder *f : std::as_const(FolderMan::instance()->map())) {
         if (f->accountState()->account() != account)
             continue;
         auto folderPath = f->remotePath();

diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index e7f4135e894c33ed8ee407ff54e6caaacc9589f7..dede5e1154db635585df155dab653068b1923ed9 100644 (file)
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -217,7 +217,7 @@ void SslButton::slotUpdateMenu()
         const auto systemCerts = QSslConfiguration::systemCaCertificates();
 
         QList<QSslCertificate> tmpChain;
-        for (const QSslCertificate &cert : qAsConst(chain)) {
+        for (const auto &cert : chain) {
             tmpChain << cert;
             if (systemCerts.contains(cert))
                 break;
@@ -225,7 +225,7 @@ void SslButton::slotUpdateMenu()
         chain = tmpChain;
 
         // find trust anchor (informational only, verification is done by QSslSocket!)
-        for (const QSslCertificate &rootCA : systemCerts) {
+        for (const auto &rootCA : systemCerts) {
             if (rootCA.issuerInfo(QSslCertificate::CommonName) == chain.last().issuerInfo(QSslCertificate::CommonName)
                 && rootCA.issuerInfo(QSslCertificate::Organization) == chain.last().issuerInfo(QSslCertificate::Organization)) {
                 chain.append(rootCA);

diff --git a/src/gui/tray/notificationhandler.cpp b/src/gui/tray/notificationhandler.cpp
index 5de87787457ba5004d8f2e348c4bb0bbb24c8cd2..d58e9ee62fcdbbc3fa1e0d670e8a9fc8288bc346 100644 (file)
--- a/src/gui/tray/notificationhandler.cpp
+++ b/src/gui/tray/notificationhandler.cpp
@@ -96,7 +96,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
     ActivityList list;
     ActivityList callList;
 
-    for (auto element : qAsConst(notifies)) {
+    for (auto element : std::as_const(notifies)) {
         auto json = element.toObject();
         auto a = Activity::fromActivityJson(json, ai->account());
 

diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index b8a54d812182bb9fc3da3e2163623d1d39635629..a0305d607aeb090e725e50243da780d236ddaa7f 100644 (file)
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -445,7 +445,7 @@ void Capabilities::addDirectEditor(DirectEditor* directEditor)
 
 DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType)
 {
-    for (DirectEditor* editor : qAsConst(_directEditors)) {
+    for (DirectEditor* editor : std::as_const(_directEditors)) {
         if(editor->hasMimetype(mimeType))
             return editor;
     }
@@ -455,7 +455,7 @@ DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType
 
 DirectEditor* Capabilities::getDirectEditorForOptionalMimetype(const QMimeType &mimeType)
 {
-    for (DirectEditor* editor : qAsConst(_directEditors)) {
+    for (DirectEditor* editor : std::as_const(_directEditors)) {
         if(editor->hasOptionalMimetype(mimeType))
             return editor;
     }

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 60417bf78357afec2eb474f79217dd61c5a4650b..8756d57b6a221267ab62aa17dc76224231dee535 100644 (file)
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -2086,7 +2086,7 @@ int ProcessDirectoryJob::processSubJobs(int nbJobs)
     }
 
     int started = 0;
-    for (auto *rj : qAsConst(_runningJobs)) {
+    for (auto *rj : std::as_const(_runningJobs)) {
         started += rj->processSubJobs(nbJobs - started);
         if (started >= nbJobs)
             return started;

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 0eac962d97a80633139e6033faee35ab22c6e1e0..c12f92077bce7151a693cabc8390a4de6040a98b 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -618,7 +618,7 @@ void OwncloudPropagator::start(SyncFileItemVector &&items)
         }
     }
 
-    for (PropagatorJob *it : qAsConst(directoriesToRemove)) {
+    for (PropagatorJob *it : std::as_const(directoriesToRemove)) {
         _rootJob->appendDirDeletionJob(it);
     }
 
@@ -1348,7 +1348,7 @@ void PropagatorCompositeJob::finalize()
 qint64 PropagatorCompositeJob::committedDiskSpace() const
 {
     qint64 needed = 0;
-    for (PropagatorJob *job : qAsConst(_runningJobs)) {
+    for (PropagatorJob *job : std::as_const(_runningJobs)) {
         needed += job->committedDiskSpace();
     }
     return needed;

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index 09949116c99c88d823b69917f21876873ef71482..e843cb9e39427523873c62672ffd9e88e9b1c827 100644 (file)
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -277,7 +277,7 @@ public:
     {
         if (!_runningJobs.empty()) {
             _abortsCount = _runningJobs.size();
-            for (PropagatorJob *j : qAsConst(_runningJobs)) {
+            for (PropagatorJob *j : std::as_const(_runningJobs)) {
                 if (abortType == AbortType::Asynchronous) {
                     connect(j, &PropagatorJob::abortFinished,
                             this, &PropagatorCompositeJob::slotSubJobAbortFinished);

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 4c55f046dade49605fd5d6b5d8ca715f548246e2..b605233af3ba04b727650775c1649c2117075344 100644 (file)
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -865,7 +865,7 @@ void PropagateUploadFileCommon::abortNetworkJobs(
     };
 
     // Abort all running jobs, except for explicitly excluded ones
-    for (AbstractNetworkJob *job : qAsConst(_jobs)) {
+    for (AbstractNetworkJob *job : std::as_const(_jobs)) {
         auto reply = job->reply();
         if (!reply || !reply->isRunning())
             continue;

diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp
index efdc54bfdb0178a7bba16074af1c9d61a241ea58..1ae04854a38f1498a92ea34b5c08d37402710bf3 100644 (file)
--- a/src/libsync/propagateuploadv1.cpp
+++ b/src/libsync/propagateuploadv1.cpp
@@ -299,11 +299,8 @@ void PropagateUploadFileV1::slotPutFinished()
         SyncJournalDb::UploadInfo pi;
         pi._valid = true;
         auto currentChunk = job->_chunk;
-<<<<<<< HEAD
-        for (auto *otherJob : qAsConst(_jobs)) {
-=======
+
         for (auto *job : std::as_const(_jobs)) {
->>>>>>> a0aaf26d9 (fixed wrong variable name)
             // Take the minimum finished one
             if (auto putJob = qobject_cast<PUTFileJob *>(job)) {
                 currentChunk = qMin(currentChunk, putJob->_chunk - 1);
@@ -377,7 +374,7 @@ void PropagateUploadFileV1::slotUploadProgress(qint64 sent, qint64 total)
     sender()->setProperty("byteWritten", sent);
     if (_jobs.count() > 1) {
         amount -= (_jobs.count() - 1) * chunkSize();
-        for (QObject *j : qAsConst(_jobs)) {
+        for (QObject *j : std::as_const(_jobs)) {
             amount += j->property("byteWritten").toULongLong();
         }
     } else {

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index c3f0291157ded6c9d9c646b63c1c8abf544fdcad..0759e6bd8ecafaa03c63764a5e154aa3c18a6f97 100644 (file)
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -80,7 +80,7 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
         // We need to delete the entries from the database now from the deleted vector.
         // Do it while avoiding redundant delete calls to the journal.
         QString deletedDir;
-        for (const auto &it : qAsConst(deleted)) {
+        for (const auto &it : deleted) {
             if (!it.first.startsWith(propagator()->localPath()))
                 continue;
             if (!deletedDir.isEmpty() && it.first.startsWith(deletedDir))

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index f4bf34c1dd11c3df54675f1003dab0f45306317c..5501971737c413e2b6e669f3c3630a6ca98471ce 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -237,7 +237,7 @@ void SyncEngine::deleteStaleUploadInfos(const SyncFileItemVector &syncItems)
 {
     // Find all blacklisted paths that we want to preserve.
     QSet<QString> upload_file_paths;
-    for (const SyncFileItemPtr &it, syncItems) {
+    for (const SyncFileItemPtr &it: syncItems) {
         if (it->_direction == SyncFileItem::Up
             && it->_type == ItemTypeFile
             && isFileTransferInstruction(it->_instruction)) {
@@ -250,7 +250,7 @@ void SyncEngine::deleteStaleUploadInfos(const SyncFileItemVector &syncItems)
 
     // Delete the stales chunk on the server.
     if (account()->capabilities().chunkingNg()) {
-        for (uint transferId : qAsConst(ids)) {
+        for (uint transferId : std::as_const(ids)) {
             if (!transferId)
                 continue; // Was not a chunked upload
             QUrl url = Utility::concatUrlPath(account()->url(), QLatin1String("remote.php/dav/uploads/") + account()->davUser() + QLatin1Char('/') + QString::number(transferId));